Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add yamls and launch file for demo3 #19

Draft
wants to merge 2 commits into
base: humble-devel
Choose a base branch
from

Conversation

TheoMF
Copy link
Contributor

@TheoMF TheoMF commented Dec 4, 2024

No description provided.

@TheoMF TheoMF marked this pull request as draft December 4, 2024 14:23
Copy link
Contributor

@Kotochleb Kotochleb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The demo is missing a readme and instructions on how to build it as coal without special flags will simply not build with pinocchio

Comment on lines +27 to +30
vcs_repos/franka_ros:
type: git
url: https://github.com/frankaemika/franka_ros
version: develop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
vcs_repos/franka_ros:
type: git
url: https://github.com/frankaemika/franka_ros
version: develop
vcs_repos/franka_ros:
type: git
url: https://github.com/frankaemika/franka_ros2
version: v0.1.15

Didn't we end up forking franka_ros2 in the end?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything from .repose should be mentioned in here as a exec_depend.

Also you are missing dependenceis on:

  • xacro
  • ros2controlcli
  • robot_state_publisher
  • linear_feedback_controller
  • rviz2
  • controller_manager
  • ros_gz_sim
  • joint_state_broadcaster

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If something is not needed it has to be removed and not just commented out


<export>
<build_type>ament_cmake</build_type>
<controller_interface plugin="${prefix}/controller_plugins.xml" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<controller_interface plugin="${prefix}/controller_plugins.xml" />

We are not building any controllers in here

Comment on lines +9 to +10
<maintainer email="[email protected]">Maximilien Naveau</maintainer>
<author>Maximilien Naveau</author>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<maintainer email="[email protected]">Maximilien Naveau</maintainer>
<author>Maximilien Naveau</author>
<maintainer email="[email protected]">Guilhem Saurel</maintainer>
<author email="[email protected]">Maximilien Naveau</author>

Comment on lines +1 to +2
<?xml version="1.0"?>
<package format="3">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<?xml version="1.0"?>
<package format="3">
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you modify the launch file to match this one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you mean adding another launch file for the real robot ?

Comment on lines +1 to +32
cmake_minimum_required(VERSION 3.22.1)

#
# Project definition
#
project(agimus_demo_03_mpc_dummy_traj LANGUAGES CXX)


#
# Handle dependencies by reading the package.xml
#
find_package(ament_cmake_auto REQUIRED)
ament_auto_find_build_dependencies()

#
# Unit tests
#
include(CTest)
if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_auto_find_test_dependencies()
# Integration test of the roscontrol controller with simulation on Talos.
# add_rostest(tests/test_integration.py)
endif()

#
# Installation
#
install(DIRECTORY config DESTINATION share/${PROJECT_NAME})
install(DIRECTORY launch DESTINATION share/${PROJECT_NAME})

ament_auto_package()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cmake_minimum_required(VERSION 3.22.1)
#
# Project definition
#
project(agimus_demo_03_mpc_dummy_traj LANGUAGES CXX)
#
# Handle dependencies by reading the package.xml
#
find_package(ament_cmake_auto REQUIRED)
ament_auto_find_build_dependencies()
#
# Unit tests
#
include(CTest)
if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_auto_find_test_dependencies()
# Integration test of the roscontrol controller with simulation on Talos.
# add_rostest(tests/test_integration.py)
endif()
#
# Installation
#
install(DIRECTORY config DESTINATION share/${PROJECT_NAME})
install(DIRECTORY launch DESTINATION share/${PROJECT_NAME})
ament_auto_package()
cmake_minimum_required(VERSION 3.22.1)
project(agimus_demo_03_mpc_dummy_traj)
find_package(ament_cmake REQUIRED)
install(DIRECTORY
launch
config
DESTINATION share/${PROJECT_NAME}/
)
ament_package()

Isn't it simpler? There is not code so there is no need to expect anything related to C++ and testing

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There will be integration tests here so yes we should keep the things + we can use the linting of ROS if we want.
Though I guess with pre-commit it's gonna conflict...

agimus_demo_03_mpc_dummy_traj/launch/bringup.launch.py Outdated Show resolved Hide resolved
agimus_demo_03_mpc_dummy_traj/launch/bringup.launch.py Outdated Show resolved Hide resolved
agimus_demo_03_mpc_dummy_traj/launch/bringup.launch.py Outdated Show resolved Hide resolved
Comment on lines +27 to +30
vcs_repos/franka_ros:
type: git
url: https://github.com/frankaemika/franka_ros
version: develop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on lines +1 to +32
cmake_minimum_required(VERSION 3.22.1)

#
# Project definition
#
project(agimus_demo_03_mpc_dummy_traj LANGUAGES CXX)


#
# Handle dependencies by reading the package.xml
#
find_package(ament_cmake_auto REQUIRED)
ament_auto_find_build_dependencies()

#
# Unit tests
#
include(CTest)
if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_auto_find_test_dependencies()
# Integration test of the roscontrol controller with simulation on Talos.
# add_rostest(tests/test_integration.py)
endif()

#
# Installation
#
install(DIRECTORY config DESTINATION share/${PROJECT_NAME})
install(DIRECTORY launch DESTINATION share/${PROJECT_NAME})

ament_auto_package()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There will be integration tests here so yes we should keep the things + we can use the linting of ROS if we want.
Though I guess with pre-commit it's gonna conflict...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants